From c5ed88110cd1b72af643d7d9e255d587f2c90d3d Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 11 May 2016 09:59:08 -0400
Subject: [PATCH] xsplice: Unmask (aka reinstall NMI handler) if we need to
 abort.

If we have to abort in xsplice_spin() we end following
the goto abort. But unfortunataly we neglected to unmask.
This patch fixes that.

Reported-by: Martin Pohlack <mpohlack@amazon.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
---
 xen/common/xsplice.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xen/common/xsplice.c b/xen/common/xsplice.c
index 21b9ec027a..b68875b5f3 100644
--- a/xen/common/xsplice.c
+++ b/xen/common/xsplice.c
@@ -1262,9 +1262,10 @@ void check_for_xsplice_work(void)
             arch_xsplice_post_action();
             local_irq_restore(flags);
         }
-        arch_xsplice_unmask();
 
  abort:
+        arch_xsplice_unmask();
+
         per_cpu(work_to_do, cpu) = 0;
         xsplice_work.do_work = 0;
 
-- 
2.30.2